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

Change-Id: I596c427de3b27a6b3f323117fbc037a0c000f417