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