Merge "Fix BottomSheetBehaviorTest" into nyc-mr1-dev