Updated from global requirements

Change-Id: I24bc7344e6828533de74a2a3f7c808888485c32d