DO NOT MERGE Fix malformed log statement. am: d7423d12a9
am: c4a0d516ce  -s ours

Change-Id: I9a6397cd16ba1f2ed0e21d8206d6c93b00778c91
tree: a7cc2edcf81156b32b6915459024d506c6314023
  1. core/
  2. services/
  3. tests/