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