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

Change-Id: I8ecee5e424be64ff3f79cb44a52ac3effc30dd47