dataset:  '$' in prototype

Change-Id: I4f6f169dd274b3daa876d5144cce05de9b1b5bb8
Merge "dataset:  '$' in prototype" into production