Merge "Make sure to notify divider always am: d6a3949 am: 821bbc1" into nyc-mr1-dev-plus-aosp