Updated from global requirements

Change-Id: Ib5b30721c2b5f6efacea8d41d7a01487e6d06a16