[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: c49a1fdd -s ours am: 4626c0b1 -s ours Change-Id: I439e19c07975bf7d203ac347c5458cf89bac67f9