Merge "test: Add desugar support to run-test" am: 5c722df951
am: 17110c13b0

Change-Id: I48276dc7bbdf289b1630a1be58848123ee565250