Change-Id: I7a1279317f6f28e9fa0bff1017e6257925e0b0bc (cherry picked from commit af3ee7dbadd5c78d6c8404c49829a794138511e8)