Updated from global requirements

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