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

Change-Id: I32890669ed6301901d64e7c53b75da5939afee26