Merge changes I36beff43,Iab7275b9

* changes:
  Fix a bug: redirect to homepage for some url.
  Fix a bug: multiple flags in ota generator.