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