Updated from global requirements

Change-Id: Ib24489face1fcfbf036d57665d81d5c1a7f54b99