Merge "Otapreopt: Add missing function" am: d760eb8662
am: 70564d5736

Change-Id: Ib98df57068e392d4669f48893ee9bc7e1dbdaaef