Change-Id: I3adc91b6bc2a2288a034678ad2df9b963f3adcf9 (cherry picked from commit fad2d0edf5d87ba7044b257747dcfb9b1090776f)