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

Change-Id: I759ba1d030aa78277af1294d9b32d41d349febba