Bug: 139738828 Test: manual Change-Id: I4e330d4ad1380dbd1e695f81b8183ca8b182b114 Exempt-From-Owner-Approval: new owner approved (cherry picked from commit d8948d4a)