DO NOT MERGE

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

Bug: 118454372
Change-Id: Ia9f5f43258e329b6dc70b81e5adbd63824dfc4d5