Merge "Fix disable2 bug" into nyc-dev
am: 2ea367d

* commit '2ea367d84f8d4269360044c25d02113c73408c2b':
  Fix disable2 bug

Change-Id: I610c13a1ff822fd985d73b5fe591a790f353b882