Fix bug 1131224, enable=true missing from user-disable

Change-Id: I611e8bd16337499df2c434d86fb6051126aef396
Merge "Fix bug 1131224, enable=true missing from user-disable" into stable/folsom