Updated from global requirements

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