Updated from global requirements

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