Updated from global requirements

Change-Id: Ic051643d006fcd9085f675124c34b7757044a042