Updated from global requirements

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