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

Bug: 139369544
Change-Id: I7a99915c3ad7345b84eb04b509667dac189a8f33