Convert to Soong
am: 5c84db5c7c

Change-Id: I6daba1cab0ab8ded97637297c8c9ec682fad2f52