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

Bug: 120502534
Change-Id: If50a87bcd69f0d400e49c3761d700f52ba8e0045