Merge "Convert to Soong"
am: 9dc8fe3aa0

Change-Id: I1f0ee217d28af6cd8f9bdb40781f55f93bd5034e