Updated from global requirements

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