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

Change-Id: I6ea81de874c4c5dbccdc9d0503f67c7bbb5adffd