Fix usage of $/# prompts

Use # prompt for root and $ for user actions.

Change-Id: Ia241921d4f3d072cf4d7459557a5d78d31d7049c
Merge "Fix usage of $/# prompts"