Amend "Fix various flashes when..." CL

Missing cosmetic changes from last patch set due to
a rebase error on my part.

Test: Cosmetic
Change-Id: I3a8a68e8cecd1947cd9e54d5fcfe8bb4a792265b
3 files changed