Merge "Utilize from-text stub module in build"