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

Change-Id: Ia77e1a72c0319eb17f08325d2f32d656c751f1ce