Updated from global requirements

Change-Id: I5840fce83406973cb45d95a667256eb1472ad7ba