Add stable/grizzly changes reverted by rebasing

Change-Id: Icce814602e603cc55052d56e2c5a699669b027c7