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

Change-Id: I01e7c1b39e2c1df26f9b64c441136ccfbedcc77f