Updated from global requirements

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