Updated from global requirements

Change-Id: I80b6767efcd918cdbd3ec74c74e3f490193350c0