Merge "Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0 am: 164854bde2" into oc-dev-plus-aosp
am: b09b85471c

Change-Id: I8b1b20d81efa2d86345b3b15600bed4cd40bb6e8
tree: 6df99ccc20b595b77804a9ea0ba11734134d1b58
  1. core/
  2. services/
  3. tests/