Change-Id: I1c39ed5c59dee739ba5044b61b3ef5ed203b79c1 (cherry picked from commit e74d1be04be47969943b0501a4f335b0b5188287)