Updated from global requirements

Change-Id: I12aab306a45c0356df50bbed9e2fb9b7319eb39b