Merge change 609 into donut

* changes:
  Fix the opt-in window for usage stat so that it works when running from ADT.