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

Change-Id: I1abafb5e41f6c0eb791cd6ac407cdff4965cdffa
tree: 8f5ed544e5a32a9d7de258754c46722fb0244056
  1. service/
  2. tests/