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

Bug: 120502534
Change-Id: I47ec78e46d4fe69da5e42c5887afb914ce231014