Updated from global requirements

Change-Id: I6784923e6d7f9aeda5a5e990596a7fb79be8df4f