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

Change-Id: Iea337e4db534b77b05b27e3bf74b45e31e132722