Not currently enabling/disabling properly, filing a framework bug. Bug: 3188951 Change-Id: I9c8900187048f548411a23c2a1b0208c79fc0a24