Updated from global requirements

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