Change-Id: I70edd6e301fd5e78d479e1882aedc9332a0827aa (cherry picked from commit b1833d9ba2c078582161da45ac392dd5c361dcdf)