[automerger skipped] Merge "Fix review comments on aosp/1213524" am: 90d4f6d94e -s ours
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 cf59536753 is in history

Change-Id: I1016fc76028aeafa9f15841b4e2951957aa11578
tree: f07018e06f94a257bf1057fd84c7933c411eb20a
  1. core/
  2. services/
  3. tests/