Support Murano Images

Cherry-picked a393a331718ac28e15e19f4c60f205d04470546c from master.

Change-Id: Iedfa5e97d7d47a2c3a49218736017642da0e01aa