Merge "Convert to Soong" am: 8f2b472ae1
am: cc65565e6f

Change-Id: I93b5c5c0eca18ebccf3ecd797c067dc27089772b