Change-Id: I41b1d7558c20fc4eb2050d40134175a2ef6330cb (cherry picked from commit 034b312d9f19024d2eabd377210d17d4080ef70e)