Updated from global requirements

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