Updated from global requirements

Change-Id: I1fb29a45a67aa334a99b3b6d5b979cec8c3f78c1