Updated from global requirements

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