DO NOT MERGE

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

Bug: 118454372
Change-Id: I92bc675e389690ffdd3a138a01d4585731c83dfd