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

Change-Id: I1bba0ad51442e03281b6b668c6a16ced39cc62a8