Also supports homography models for future experiments.

Change-Id: I4510540f54133e063891ed491c95c087222f7810