Remove remaining sudo usages

Remove sudo usage and adjust prompts as needed. Fixup markup to
follow our conventions.

Change-Id: I93e4d06c6ea778e8eb6904338bc9c36080a24dac
Merge "Remove remaining sudo usages"