Change-Id: I3bd1222642ab3e8d24bf0f5cca897c2ce638757a (cherry picked from commit fd433a12) (cherry picked from commit 485821de)