diamond for dataset and ^lvs1*

Change-Id: I3bdb4ed20b3e5b94e218e9c9c8b47a6f546e0707
Merge "diamond for dataset and ^lvs1*" into production