Updated from global requirements

Change-Id: Ia6c53a49bebf83cd08a4a031c6823fc8c92047cf