Merge "Remove the lookup distortion class" into oc-dev am: 78145dd40d
am: d32c27c2e9

Change-Id: I55db223078a9a25e90de5e10af1199c2ad56dd7f