Updated from global requirements

Change-Id: I688f41ff4423d51d27bc737f66272855d7230778