[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 1c70b40dcd  -s ours am: 9aa599b393  -s ours
am: 7dfce753e1  -s ours

Change-Id: Ib86a5f8dfd2f61d2df44846e4af337b52d0455fa