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

Change-Id: Ie0f0c11c6bde868b21cb6f4ba90a294944e2e64e