Change-Id: I7c4a5f8104dd1887fcac32a525301572243cdb81 (cherry picked from commit e44fce31097a33a6bfaf8225b21047a12584b36c)