Adjust building question, remove disagree question

Change-Id: I30cedb52add79aac675b84414931e7b468cf6c2d