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