[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: fbe47941b0  -s ours
am: 87bccc5615  -s ours

Change-Id: I390f67af7e56fb515f09f3f3cf6ca2468158954f