am 17b63ba5: Merge "Remove unnecessary commit/uncommit"

* commit '17b63ba588598d0bd6f643d3a8cb385c75d2c163':
  Remove unnecessary commit/uncommit