Merge "mGerrit: Add Omni as supported cloud option"

Change-Id: I78bde0e737e547b057c61524b8dec785db50a428