Merge "Merge "Properly measure dataset presentations" into oc-dev am: 85548127a3" into oc-dev-plus-aosp