Bug: 145530620 Test: manual Change-Id: I612e4bc4639f4551c5dda6dd4509fb3a96464689 (cherry picked from commit 02ce8242)