Merge "Camera: Check consumer interface before disconnecting" am: aa59be48d4
am: a4f8c20bf9

Change-Id: I691c6c369db7b6334a54dbe98b61711b8185e1cb