Updated from global requirements

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