Merge "Convert to Soong" am: b466949e32 am: e4ed25ce8b
am: 6149739971

Change-Id: I1f0f2276e21ab46a7f0fed2f9e287b5f21b070cc