Updated from global requirements

Change-Id: Ia7c461678e33507f76183e832c18912070dd23a2