Fix exception being thrown if CMHW is not installed.

Happens during debugging when mmp'ing the app.

Change-Id: Ief84a812696ef3f2515701790f96649cbde0f7d9
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0