Updated from global requirements

Change-Id: I41e63a06f85e17afa99f07df06ed2848032d449f