Merge "Added custom alert reminder interval support" into nyc-mr1-dev