Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be (cherry picked from commit 1792ec17b8a352a2469e2136c6ea9bb34d99b282)