Updated from global requirements

Change-Id: I1b1704bac8643e603dcc41d905c3379fca1617fb