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

Change-Id: Id5e78fc0d96a4532c5f7d11721bad1b243767915