Updated from global requirements

Change-Id: I3050d7c88196d2426c7e4821b1e504d2f67ecedd