Change-Id: I240e01af0bad80587951dd46d91af148948cd90f (cherry picked from commit 9e45568cdb47a111ee113d0cc4e78353d4761256)