Merge "Convert to Soong"
am: 8f2b472ae1

Change-Id: I97a2917d8f1ea9c868ce7bf88223e6f4aad8bd3f