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

Change-Id: I70dc34da54d232969fb6b1ec7005b44a40ab43fb