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