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

Change-Id: I629b0d11e974c2885490156d51b12a409235036c