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

Change-Id: Ibc7bb29ef2ffa2f33c02310174713f628a077ee7