DO NOT MERGE

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

Bug: 120502534
Change-Id: Id2708adf8c4e6c15060eeb5462e0d8bed998e54d