Updated from global requirements

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