Updated from global requirements

Change-Id: Iada509edc3e3c538198b49abcdd0cc4fee88030f