Updated from global requirements

Change-Id: Ieeab73c71312e35f7e1ab6ab5ac32d0f2a22ac43