DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

Bug: 120502534
Change-Id: I7351a1832c4bd2fd86324183ab83e9088d716822
tree: f2763eef45581a6df305c6f3f91150d213b4c09b
  1. core/
  2. services/
  3. tests/