Updated from global requirements

Change-Id: Ibc523c0034585230f072919fbab576efc4d32f35