[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: d80076c038  -s ours
am: 6046e7a005  -s ours

Change-Id: I3dc189305098e5d24a14b316171b7854511c24f6