Updated from global requirements

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