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