Updated from global requirements

Change-Id: If91358f27864cff105fe50d6ae49421fafdc3785