Updated from global requirements

Change-Id: I571cda006deceac553d75a7f60e6bb3b4129b058