Updated from global requirements

Change-Id: I3d616a33a9db4c9793dc33d814326763cc039616