Merge "Fix annotation / debugging" am: 69bbb1904f am: 1d866c0bf3 am: 39d6ba888d

Change-Id: I81c9b247f854d8b5d75fdd232f46979a9f5ed9d3