[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 93e6c59784  -s ours am: 4dd78f7af5  -s ours
am: 3aaead4c45  -s ours

Change-Id: I2343f8283036100d8f901fc5f36206ac17d172df