Bug: 32509664 Test: manual Change-Id: I2ac4fbea55caefcc4a4952f4c3a2b001579d226b (cherry picked from commit 87b6277f)