Make disable() work.

Change-Id: I93fea37e777b3e04fe7f9171d5b84821587c24f5
7 files changed