Updated from global requirements

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