Change-Id: I1658308f9d9529c969f7067d053f16f779f8b6a6 (cherry picked from commit bfcb05e24ef5224cabc42772e94cc0cbed3de412)