Updated from global requirements

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