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

Bug: 120502534
Change-Id: Ia8e57a0b1f366d03bf23b503f018349ca6518088