am 57f49931: Merge "Revert GetThisObject change."

* commit '57f499318055ca9f32b188777825a5b54c503cd6':
  Revert GetThisObject change.