[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: d80076c038  -s ours am: 6046e7a005  -s ours
am: 622ab2685e  -s ours

Change-Id: I6d8bfe2501f7bc200f99163ba65b3a04e8a2719c