Updated from global requirements

Change-Id: Ic4d8be5794502bf30bded85431777104c6a54fe7