Change-Id: I92d3cab755a65da1ee3633a69122e5be1fafc6e9 (cherry picked from commit e2ce19d001c6499303d43f64bf12628e4ff4924c)