Updated from global requirements

Change-Id: I3219e39e38d7d0044ffff06192027a700520476d