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

Bug: 139369544
Change-Id: Ie9161cda1c126cebca27aa4a92cf7e855e0d2c63