Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: Idc6a67cb96ec899505e2fe0e65828db9dc90cb96