Merge "Convert to Soong" am: c6fd8bb6f9
am: 64b243a740

Change-Id: I4ae7b7d3c6f93de2f05c9fa53887b7d8721340c6