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

Change-Id: I966efa3449acb209cda36e17596c72a4715e0401