Updated from global requirements

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