Updated from global requirements

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