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

Change-Id: Ic3caec52f7c24a21dbf7a8b2180217036234bae1