Updated from global requirements

Change-Id: Ifd9110cf94dfd2f62e59939a7be1a88e919beb36