Cut over to grizzly -> havana

Fixes bug 1175340

Change-Id: Iff137039f4ac1d252c661fb945ce9d7b356e8f61
Merge branch 'havana' into dt-test