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

Change-Id: I9df7df43ddbe0e0569e46d4fd140e858ef473e25