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

Change-Id: I2e34b0795448cee1aca306202f61e491c80bd78e