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

Change-Id: Ia4517489be6fcfba9cb46f97b25d619b2c4f2718