Merge \\\"Do not force turn off of Jack warning\\\" am: 0a26fc0ace am: 5185323de9
am: 9530d9131c

Change-Id: I04afeabcaad279368f8e0eabbb7d257ebf1a8f5b