Updated from global requirements

Change-Id: I4c008a3d33df5d04b92f8b9d08563697a62b5615