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

Change-Id: Iba4aba95d60439b1036eaa120e99d49f4a525c36