Merge "Overcome disconnect during oem override" am: 5e093d997a am: 961cc1867b
am: afd07cb040

Change-Id: I7ae6b814093c2987d890688aefae53559072c771