DO NOT MERGE

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

Bug: 120502534
Change-Id: I806b813f13d12da2ab08566a0ce3812000158aa4