[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 6ab5ca78 -s ours am: 56585008 -s ours Change-Id: Id07164410098bbdf4f0a62bc1a61ff4c02ae490a
mentioned in commit 0993ec20