Updated from global requirements

Change-Id: I94fd3a02cfa6c7d4889fdf57830c9395bc53fa33