Updated from global requirements

Change-Id: Id105ee1d495144517a684edd49116cba24060529