Updated from global requirements

Change-Id: I3cc06e37008930bacf14067d7e722db0f5b3fafd