Fix 4081795: Blue glow gone wild. DO NOT MERGE

Change-Id: I9038ed322811987e69045602f438cdf2bbd946e9
2 files changed