Change-Id: Ia4d1cfad316bb16d1f546bd472ef65304794b07f (cherry picked from commit 9eb90a86789558c78155565e4b54f23ee1c90db0)