Merge "Sequentially handle enable and disable" am: ad9664c0a9

Change-Id: Ibb49ec421775a2f215bf6ea82cf8aecb4c70b0db