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