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

Change-Id: Id191de8883914ea170db9ac6a93cc4bcb9b62eb4