DO NOT MERGE

Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: Ifc98beb9efe48ef7a0b7a75cded435de16fe1567