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

Change-Id: I3dc189305098e5d24a14b316171b7854511c24f6