[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 7a28e3e8db  -s ours am: d38d03bab6  -s ours
am: 3ede46878c  -s ours

Change-Id: Idd571a75a27c04585fa1798ae098c694f8f94fe0