Updated from global requirements

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