DO NOT MERGE

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

Bug: 120502534
Change-Id: I7db3ad0871e3565cc64620b68027580c4e53ba32