Updated from global requirements

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