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

Change-Id: I48fbe5d2b5b3194862703a12c1a11292d23c6fce