[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 6ebc0609b2  -s ours am: cbf901d025  -s ours
am: 44392c46dc  -s ours

Change-Id: I5a1d60798527694789caef6a0ec493d28e610bb7