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

Change-Id: I358b9f7960cb4df5854b2d9c04eb6b7748a5d751