Fix dieUsage warning and tweak message

Bug: 68935
Change-Id: Idc0294d714216fbd8a8e507c96d6d35ac2480465
Merge "Fix dieUsage warning and tweak message"