Updated from global requirements

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