Updated from global requirements

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