Updated from global requirements

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