Also do some minor cleanup in other demo apps. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=173146425
