[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
am: d06f3a304f  -s ours

Change-Id: Ice060d181f620da8b06138735e26caa9c9cf0a35