Updated from global requirements

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