Support Grizzly still

Change-Id: Id9075c07fc29fd6c97d8d62431ab05a9d6afb348