DO NOT MERGE

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

Bug: 120502534
Change-Id: If90a985d18a0cab1677c88663e858fc7f5f75e18