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

Change-Id: I8b816063486d7ff27f198a5c0b9ec1d3ed766acf