Updated from global requirements

Change-Id: I5d98464e37d88b7fcb33e8cf365df6e138c3f505