DO NOT MERGE

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

Bug: 118454372
Change-Id: I062313ad6a7efd65ffdd90b1912030d39fc1c43e