Merge "Fix annotation / debugging"
am: 69bbb1904f

Change-Id: I9da174d658ada4acf399fe9f743b012aea7ebeae