Merge "Merge pie-platform-release (PPRL.181105.017, history only) into master" am: 998175dc6f am: 9edc5a4591
am: 7a70f79748

Change-Id: I2a11efc04ed374df996e2a1b4690c992d4f6c959