Updated from global requirements

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