Sync requirements with stable/havana requirements

Change-Id: I5ca0a8ddcf89fe816d47dfd4d720410780444d60