DO NOT MERGE

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

Bug: 120502534
Change-Id: Ic86a6a971afc12abb3a3ce3aa28d8ae774185598