[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 74a971a76f  -s ours
am: 671bf751dd  -s ours

Change-Id: I9c574c7247a58be34d3ae640fab1ebcb95e388ad