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

* commit '0250ae2c1b1b3b75a9b1f3c995be031efef50bcf':
  Allow Shell to change component enabled state

Change-Id: I2a29c8e15ba81a9aa5c3950c8aeccd3d4ff662cc