Updated rally gate scenarios

Change-Id: I021e4be45cf3e9d92c9e099cec63ae844831c995
Merge "Updated rally gate scenarios"