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

Bug: 136196576
Change-Id: I010ac50e503347465f2794e4815b59efd2b575de