Merge "Disable jack completely"
am: 480ee2e58c

Change-Id: I72f0d856228dc5b68e5f581802d5a64f9c814255