Merge "Fix assertion failures caused by different instance type" am: 5500d33555
am: f390d17b40

Change-Id: I3c04d7dcfbaf99bac711a3f1eff8ee1791d8f438