Updated from global requirements

Change-Id: Ib8fe7d7951bd6a5f295ceb5c35e87f93fb955fa3