Updated from global requirements

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