Merge "camera: add support for camera removal"
am: cf99978291

Change-Id: I15aedfd09b7cfbdd608bf775ba11b41598e6b02f