Change-Id: I9bb2aa8641b780cf90dd8a0aefdc57169c02186f (cherry picked from commit feadacb580e7d2c325453b3afe474049d27d11d8)