DESCRIPTION

wip: merge dsl

Change-Id: I7b895b067382231214146f50d31be432126d9776


COMMENTS

author: Natasha Sullivan
date: 2015-12-30 09:24:56.964000000

Uploaded patch set 1.

-------------------------------------
author: Tate Garrett
date: 2016-01-04 10:53:43.215000000

Change has been successfully cherry-picked as 15bf1594809c7edb2b578e5bb516774c6688f35c

-------------------------------------
