am f0e9072f: (-s ours) am 3499d8c8: (-s ours) Fix 4081795: Blue glow gone wild. DO NOT MERGE

* commit 'f0e9072f8ed85a97c461b73c7a0df1622cba4001':
  Fix 4081795: Blue glow gone wild. DO NOT MERGE