DO NOT MERGE

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

Bug: 118454372
Change-Id: Ia022204bcc08bff35b3f5b4bff1ce58051fcec5c