Updated from global requirements

Change-Id: I68b4e8cf0528f2c3cc63811218379eb416a418cf