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

Change-Id: I8b94a408dd874a2f78f1a9c8640a33935daa8ad8