Updated from global requirements

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