Added changes to work with grizzly2 and beyond

Change-Id: Ia8acbeee1bc4bbcae43be4324ef646dacea6857c