Remove underscore.

Change-Id: Iaf2791b96e81d6a0d4846adb3128e4dff61faf30
Added compute flavor support.

Change-Id: Idb1eb2f838074ce5fb3d4aa7b72fd747ac6915c7
Merge "Added compute flavor support."