Merge "Rebundle Contacts build" into mnc-dev