Updated from global requirements

Change-Id: I577ef3b2881e8b85fd7ebb8aca4a71ad13da2294