Updated from global requirements

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