[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 6ebc0609b2  -s ours
am: cbf901d025  -s ours

Change-Id: Ife0539ef1dbc3b6be242513b18e595642089e1dd