Updated from global requirements

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