Merge "Cleaned up the flag log_mms_sms_database_access_info" into main