Updated from global requirements

Change-Id: Ieea9cc5b41ac787fe9b1378f0df2f5c43ad4e6a9