am 3737aa54: Merge "fix set url update bug" into honeycomb-mr1

* commit '3737aa543fa22c980c72c83f09c5f4e84ed38734':
  fix set url update bug