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

Bug: 139369544
Change-Id: I820e1e938d1badb3dccd0e39cc76683826ae82e7