updated for the stable/havana branch

Change-Id: Ie0df1b2a40a8d30c25eab55405d83f422649f7d7