Updated from global requirements

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