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

* commit '637d2992bc1814bfa74ec24e8fcbc3a284fe9836':
  Fix disable2 bug

Change-Id: I4ff7acdb416c81669a19562e44cd94d1c9e98805