Updated from global requirements

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