Merge "Some internal clean-up." into arc-apps