Updated from global requirements

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