Updated from global requirements

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