tree ae8605c09d5d89d8dad29711f18f31d4c256b634
parent 2a820bdf5002c2b34a0632c3b5227dcfadeffa70
author Robert Carr <racarr@google.com> 1490061870 -0700
committer Robert Carr <racarr@google.com> 1490214641 -0700

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