DO NOT MERGE

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

Bug: 118454372
Change-Id: I5d9f000ef5d44e35eaba14a0547bc0939270ecbe