Fixing MTP and (not :() camera....

Change-Id: I041e4aa96162a24bcdeed2e53a1f4e47dd01e510