Updated from global requirements

Change-Id: I3e058564c85a96f412cc62f807790972d54177be