DO NOT MERGE

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

Bug: 120502534
Change-Id: I15ebe92b97d8143c7003f2d729a7595be82f30ea