Merge "Average of top 4 CNO" into oc-dr1-dev
am: e7f5c6aa38

Change-Id: I0080002fb2110fe08d24551f204ff68fcd1d273d