Merge "Bump some angler performance expectations" into oc-dev
am: 689685b5e7

Change-Id: I6d157185bc6354a46f1827003d302118a7ee46d6