Updated from global requirements

Change-Id: I00ff8b1b482abd8f94aba4a579eda532a471bba8