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

Change-Id: Ia130213325d936e39042945c12aa850b69b0d06a