Updated from global requirements

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