Updated from global requirements

Change-Id: Ifdc6d7bbbc83ed405e88701de983f53c9cf97c2f