Updated from global requirements

Change-Id: If517537cd1f7c2ab6ff75456993ced8d1e746874