Updated from global requirements

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