DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master

Bug: 139369544
Change-Id: I95d8d3c2a54203dcd11f5316c6c638ea72e04afe