Merge "Otapreopt: Add missing function"
am: d760eb8662

Change-Id: Ie65a9613ef0750050d8a3db4243252888d8d626b