Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Ic008d8395b3a8b3e6082cea3f501d384a87861b0