Updated from global requirements

Change-Id: I072548a69f9bcb72c1c4516faf02ec0cfd562ac0