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

Change-Id: I8adf4be9efcdadb5e629abad21227078f5968109