Updated from global requirements

Change-Id: I0364e0e18c43ee24b9778c3a72c77cadf795771e