Adjust building question, remove disagree question

Change-Id: I30cedb52add79aac675b84414931e7b468cf6c2d
(cherry picked from commit 2fc8b6d9f6db85ba9139b181fb2e397f2d8919a2)