Change-Id: I9f064d27cfc120dbcf4b693da40d113b054a5249 (cherry picked from commit 925504180af7e5001956f04525217c4c74c9fac0)