Updated from global requirements

Change-Id: I3abea460f228517807b0462e683ca56d9f971d6e