DO NOT MERGE

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

Bug: 118454372
Change-Id: I968d300688df18e6618c77e5a8be8c9fb11583af