Merge "Make umbra lighter when the blocker is too high and has no real umbra...
Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev am: 8e93abcd
am: f8bfc789
Change-Id: I681e454b90d6f7dc36bc363e3eaed3ceb9f58ab1