Updated from global requirements

Change-Id: Ic229d9afdaf01abeff54d1087c21c70b25dcb0dd