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

Change-Id: Iac324136ab2b79984f9b8d335d3080d0357653f5