Change-Id: Ia065f30eecd3f234da6228c1d02b4ab780973b62 (cherry picked from commit ba5a84957b7acb3c0223c2c1d95ec925b7a6caf6)