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

Change-Id: I139fbb395793d9af0a32dcbf6e07f697f0c7a8b5