Updated from global requirements

Change-Id: I65acb8237b4b8a5229842fcb1e007524b36d915c