Updated from global requirements

Change-Id: I9c1b02904b83c537ea4f51a54fd7c32b18244c7d