Updated from global requirements

Change-Id: Idb5cb2ede20c95ee266ab4ef24b2654f172d2003