Updated from global requirements

Change-Id: I8171038ad7c699137effee153f46e057bd8e3b06