Updated from global requirements

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