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

Change-Id: I8cbf23a10c05b55b73215358dbb3bd0ec8636aa4