Updated from global requirements

Change-Id: Ibb1cb38718fd209a5a545b6758434c8dab7b9bf3