Updated from global requirements

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