Merge "Simplify the build target name." into prism_dev