Merge "Don't log identity in to bugreport" am: 2cc6820c70
am: ebfe1fbec6

Change-Id: Id7a6d8317c8d7fc3aea5e5ae43566ecacefe07fa
tree: 9e04a2a710d886320384069d7e8413ac75ae4138
  1. service/
  2. tests/