Updated from global requirements

Change-Id: Ibb290d0f2d616b7730914bfc829a7f555ba0b688