Merge "Otapreopt: Fix count" into oc-dev
am: e620d805d8

Change-Id: Ifc134fd806137d09ed7ac914ea37769e0c1d92ad