Handy to have more layer detail for logging. Change-Id: I6933a8fcb90b9cfb70fc85a358244863aac9d702 (cherry picked from commit cf275f37)