Updated from global requirements

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