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

Change-Id: I5de4995c3d41ff310fa67e7d2cbe4e5c6cfea5f4