DO NOT MERGE

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

Bug: 118454372
Change-Id: I622f5c591e963b7d45ac3f372e53f864826190e8