Updated from global requirements

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