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

Change-Id: I65545eb14c562a6418bf7eacf03131b75f2eb809