Updated from global requirements

Change-Id: Ic80266ad328243a91688bc573be7e49d026c4b1f