Updated from global requirements

Change-Id: I966ff8ba796774c6ebf5b99ae799bb14196fcf81