couple of upgrades before release

Change-Id: Ifcbb5cb9d9d4c4ab1faab9505afe9ac4a0bc528c