Updated from global requirements

Change-Id: Ib0922bbc1be3c8f738e547fe54a080036b072cdd