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

Change-Id: I60bd06e306a806da9db60053e8383a31961409bb