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

Change-Id: I0fe69f7c3e729f4317b7bbead5d4dc575fa83ba6
tree: cd6f7e2f2d6ca3166d5abb78914410b29f3804f5
  1. core/
  2. services/
  3. tests/