Merge "Replace LOOKUP with EMBEDDING and HASHTABLE_LOOKUP" into oc-mr1-dev am: 9e06ee8c54
am: f22b69789b

Change-Id: Ia6f5e963ebdb0a7fa04a2ebba63265239cbf2263