More # to $ prompts

Change-Id: I1c420908dc97bf8e9ffefc78c498d0241dbf01b6
Merge "More # to $ prompts"