[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 267468d777  -s ours
am: 251eec56c8  -s ours

Change-Id: Icf1ed70435bd4de44795749ba44cd90693856ff8