Updated from global requirements

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