Updated from global requirements

Change-Id: Idd49b98c9c8c25e98a7bae9bc8f93c6df1ed267b