Updated from global requirements

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