Updated from global requirements

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