Updated from global requirements

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