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

Change-Id: I54c880e496ba79d37748115eacd1015a2bd2171c