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

Change-Id: I1e10b4f664fe5b9218da9d180ef955fd1ff46f9b