updated for the stable/havana branch

Change-Id: I43f0cc9d88209d19b0510f298771a22daf7d13a0