Updated from global requirements

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