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