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

Change-Id: Ie6b379df14d67123f5644b8febeae4a7f1c22b0e