[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: a32f898720  -s ours am: 16985b8bf2  -s ours
am: 0c0f42ff16  -s ours

Change-Id: I10c1e303d19836aaaa2d5991925fe8a93fbc0791