Updated from global requirements

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