Updated from global requirements

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