DO NOT MERGE

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

Bug: 120502534
Change-Id: I56f2a9f345b3fce27e3841bbdd11fa00a32c5a36