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

Change-Id: I87b5fd45ccbb09cfd9e33f6bd11a9086bead3d05