Updated from global requirements

Change-Id: I88293dd86bbd13c75fc868b4c9af792c12476f53