Merge "Update CPA startActivity javadoc to refer to passing the result back"