Updated from global requirements

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