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

Change-Id: Iac796bee060ceb4d605d45a3ef03276108f82ac0