Updated from global requirements

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