Updated from global requirements

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