Sync latest stable/havana

Change-Id: I5e159ab08f25d75eab784b06cae486f3fa422e16
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>