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

Change-Id: I1865e45dcd36afe1874564b743eb4891dcc68ceb