DO NOT MERGE

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

Bug: 118454372
Change-Id: Ic4020590e0d8dd2409a2591cb8ff3684daa4e81d