Updated from global requirements

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