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

Bug: 120502534
Change-Id: I4993ed4cbd133e995e950298c65ad57c73c9a5f3