Updated from global requirements

Change-Id: I79c3b759e1676d853454e00b305ffedbdc6cbe4d