Merge "Make sure both options objects get created." into dalvik-dev