DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master

Bug: 136196576
Change-Id: I481d824726ae0260b42cd7a4acc1c6fce593c324
tree: 81e65c0a7bce0c825950e89e4e1788401d7cef88
  1. core/
  2. services/
  3. tests/