Merge "[automerger skipped] Merge "Clean up bugreport API." am: 2e44838064 am: 8deb2ecb31 am: ec0a01ec78 -s ours am skip reason: change_id I95f004106ba97bc9e99859a8b23b96a86b6a43f4 with SHA1 552e257a9d is in history"