Updated from global requirements

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