Updated from global requirements

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