Grizzly branch update

Change-Id: I6659b82d6be2ef6339e1608c8ed448030d018416