Merge "Fix the latency model." into oc-dev
am: de73eb1047

Change-Id: Iaba80ab8508ceed5c3e0a4839777d0bd65f7ca6a