[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 92466dd607  -s ours
am: 357c3ce0f8  -s ours

Change-Id: Iecfe46b6807f0632963e8b06ef234fd28c1a1516