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

Change-Id: If89fe72bf01ff36a532aa16b9d990aee69ed5e59