Squashed commit of Hybrid Tile (base)

Change-Id: Ic56a6d08a24c63dc866994c101ead30babc200a8
merge fix

Change-Id: Icfec0967340267d459c53a4a6d86ab3f83125755