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

Change-Id: I9dcfaf1b81e3652a084041bd714fde4c1a55db53