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

Change-Id: Ia08a2da37724a6873f7a9e4821f0f7f1c59e38c6