Updated from global requirements

Change-Id: I3f3ca2b529a5b33750e758298252dbf2f74bc291