Change-Id: I6d82af91adec02698afddde6883b1fe1924e6041 (cherry picked from commit e7e20190dface4117abe70dcfd96d19b0e4f5339)