DO NOT MERGE

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

Bug: 120502534
Change-Id: I452ef1f6a8603ff88e87f67b41fae2f84bf62798