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

Change-Id: I9ebe0bb6da776c6b6ea264a322221303314d15bd