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

Change-Id: Id613e7a838c0852e769044111b6f4412a9cf5880