DO NOT MERGE

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

Bug: 118454372
Change-Id: I73e25f302dd0a884ec0a1660ed2a7f1aefb9aba1