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

Bug: 139369544
Change-Id: Id72493f634980e5bbb960f97919ca727d2cbdd85