Merge "Add debugging for b/62653020" am: 803a8d73f1
am: 7c1e270ad5

Change-Id: I627c067e6deed122c4948395f3389aac3e4a601c