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

Bug: 120502534
Change-Id: Iae94a89162dc86bc22c571fc3b09d74b3f9337c5