Updated from global requirements

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