updated for the Havana branch

Change-Id: Iaa6de77139397fdd5cf72acf0e5072d80c6151ce