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

Change-Id: I4248c4aff3ed41f71d3da3dbbc6ee5b8946b48e3