Updated from global requirements

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