DO NOT MERGE

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

Bug: 118454372
Change-Id: I6d71632b4cc67a24f28dd12d83d908588cec1bd8