Updated from global requirements

Change-Id: Ic9071ee0571bfb0bc7df0f0d7d5199fdc91d83bc