Updated from global requirements

Change-Id: I94895638fd4e1ba15e48b01be7301ec9c7b8b6fd