Update from global requirements

Change-Id: I7980971973a47b8dfb0615da9ebb5ca41926c857
Merge "Update from global requirements"