DO NOT MERGE

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

Bug: 120502534
Change-Id: Ib20fbaf686b6745cfa98296154c1cb3e93c6c8a9