Updated from global requirements

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