Merge "Provide a way to disable trusted device." into qt-dev am: b486c97c16
am: cc2a310c29

Change-Id: I664cb08990ad7fb94c3c35daaf6df2636c1efb5c