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

Change-Id: Ie235529d9065bdc9f258f91ba8206cda6d96379e