Updated from global requirements

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