DO NOT MERGE

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

Bug: 120502534
Change-Id: I28c7e3b3d7f6ae826e2af4925510dcee0afa7a28