Updated from global requirements

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