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

Change-Id: Ide75143fb1cb611a5e61b98cb023b7faac425ced