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

Change-Id: Ic9120606d905d46471ac08efc55134131c252d62