Bug: 37121975 Test: tested locally Change-Id: I2563408d10edfac74d04d68116cbf2a2ac66e9a3 (cherry picked from commit ebda0286)