Merge "Merge pie-platform-release (PPRL.181105.017, history only) into master" am: 1309cb5e4d am: 2839195865
am: d301996520

Change-Id: Ic3311bed61afe4d160c4c08335515164047fbd65