Updated from global requirements

Change-Id: Iba7e7b0c64af522174ec149736c824de7227d0ee