(cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3) Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67