Updated from global requirements

Change-Id: Iecce22d24ec2436d3cf0f7fd906cd5e16cf821cb
Merge "Updated from global requirements"