Merge "Shorter notification text on AoD" into oc-mr1-dev