Updated from global requirements

Change-Id: Ib981f03d65d25170baed11844abf3cedfaf4cf8e