Updated from global requirements

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