Merge "Allow Shell to change component enabled state" into nyc-dev
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I964e0aebb669adf368524454e2ca681784e8e67b