Updated from global requirements

Change-Id: Ieded1c4bdc6fd977fcb3131707028616ee184bd9