Merge "Convert to Soong"
am: c6fd8bb6f9

Change-Id: I4811ff85664d160d04bd7da1a0fff3822cde5ec3