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

Change-Id: Ied9e3eab1f121182fddd5cf65b370dcc7a87a4d7