Updated from global requirements

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