Updated from global requirements

Change-Id: Ie6216462170c715edebe7159f558bb310eff21f0