Updated from global requirements

Change-Id: I6ba0a580547d52534517c50a2367ee111d0f0aef