[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: c75c06c0d4  -s ours am: aef3b69fea  -s ours
am: 408d2b0a2b  -s ours

Change-Id: I8f86bbd66820dea06df54d02e788f6f57b0492b8