Updated from global requirements

Change-Id: I4f210812d4b2df3992b8444f384839b36f807123