Updated from global requirements

Change-Id: Iceb6bbb1407f081d63a46793c1c09037fc941213