Merge RP1A.200720.011

Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7
tree: 5c8d95fe6f21c171ada293529476ac332cd7acd9
  1. core/
  2. services/
  3. tests/