Merge "Disable jack completely" am: 480ee2e58c am: 56294539dc
am: 657f61bdd7

Change-Id: I84ff3b48657eb53994a222bc61336975d4dca0c8