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

Change-Id: I7c02ebda03e675033b25332b8819ce2f1b699c95