Updated from global requirements

Change-Id: I3257c9d5653427cf1592abd693bc0d233c6ff3a4