Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev am: 8e93abcd6c
am: f8bfc7890f

Change-Id: I681e454b90d6f7dc36bc363e3eaed3ceb9f58ab1