Change-Id: I7bc4209b311360c3357e3974f0e66a51daa78232 (cherry picked from commit 507c6a9b2cc4f854ef78acd07bc452ffb21b6bdb)