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

Change-Id: I339e73aa4dbc55273dce55fd36f18c6988a5b4f5