Updated from global requirements

Change-Id: I4040864ab8445c82416942d6c5bbe012e2e4b2a0