Updated from global requirements

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