Updated from global requirements

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